From 46be57f1ea082e62dd14f9928f9b98a934aba854 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 11 Apr 2017 19:58:50 +0200 Subject: [PATCH] Update Debian config and scripts for cargo 0.16 --- debian/gbp.conf | 4 ++++ debian/make_orig_multi.sh | 2 +- debian/patches/clean-cargo-deps.patch | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index c16083c70..cbdd2d060 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -7,3 +7,7 @@ debian-branch = debian/sid [buildpackage] submodules = True + +[import-orig] +upstream-vcs-tag = %(version)s +component = deps diff --git a/debian/make_orig_multi.sh b/debian/make_orig_multi.sh index 2df1b45ff..53333839d 100755 --- a/debian/make_orig_multi.sh +++ b/debian/make_orig_multi.sh @@ -45,7 +45,7 @@ export GIT_AUTHOR_NAME="deb-build" export GIT_AUTHOR_EMAIL="<>" export GIT_COMMITTER_NAME="${GIT_AUTHOR_NAME}" export GIT_COMMITTER_EMAIL="${GIT_AUTHOR_EMAIL}" -cargo vendor --verbose +cargo vendor --verbose deps # Unpack artifacts and clean embedded libs ${WORKDIR}/debian/cargo-vendor-unpack.py diff --git a/debian/patches/clean-cargo-deps.patch b/debian/patches/clean-cargo-deps.patch index 0326e7f9b..01d801a28 100644 --- a/debian/patches/clean-cargo-deps.patch +++ b/debian/patches/clean-cargo-deps.patch @@ -14,7 +14,7 @@ Index: cargo/Cargo.toml [dependencies] -advapi32-sys = "0.2" +#advapi32-sys = "0.2" - crates-io = { path = "src/crates-io", version = "0.4" } + crates-io = { path = "src/crates-io", version = "0.5" } crossbeam = "0.2" curl = "0.4" @@ -29,7 +29,7 @@ -- 2.30.2